Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 21:37:48 +0000 (14:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 21:37:48 +0000 (14:37 -0700)

Trivial merge